Here are patches that may or may not be useful; these patches are not applied
by default and are not currently on SBo. 
